Move the mixed module check function

This is only called in one place, move the function there.

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 8af6ee44717dbd3c90e9ead9165ae02e90342773..7a7d2e6ce70904016d0d3b367a6526bf4f7757c1 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -545,6 +545,34 @@ setlocale_initialization (void)
     }
 }
 
+/* Return TRUE if module_to_check causes version conflicts.
+ * If module_to_check is NULL, check the main module.
+ */
+static gboolean
+_gtk_module_has_mixed_deps (GModule *module_to_check)
+{
+  GModule *module;
+  gpointer func;
+  gboolean result;
+
+  if (!module_to_check)
+    module = g_module_open (NULL, 0);
+  else
+    module = module_to_check;
+
+  if (g_module_symbol (module, "gtk_progress_get_type", &func))
+    result = TRUE;
+  else if (g_module_symbol (module, "gtk_misc_get_type", &func))
+    result = TRUE;
+  else
+    result = FALSE;
+
+  if (!module_to_check)
+    g_module_close (module);
+
+  return result;
+}
+
 static void
 do_pre_parse_initialization (void)
 {

diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 57e6eb0f245df55eea81e097babaf66bbc730ef0..2f10c8671bea5fec0961320e689ff08ed14ad138 100644 (file)
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -186,31 +186,3 @@ _gtk_find_module (const gchar *name,
   g_strfreev (paths);
   return module_name;
 }
-
-/* Return TRUE if module_to_check causes version conflicts.
- * If module_to_check is NULL, check the main module.
- */
-gboolean
-_gtk_module_has_mixed_deps (GModule *module_to_check)
-{
-  GModule *module;
-  gpointer func;
-  gboolean result;
-
-  if (!module_to_check)
-    module = g_module_open (NULL, 0);
-  else
-    module = module_to_check;
-
-  if (g_module_symbol (module, "gtk_progress_get_type", &func))
-    result = TRUE;
-  else if (g_module_symbol (module, "gtk_misc_get_type", &func))
-    result = TRUE;
-  else
-    result = FALSE;
-
-  if (!module_to_check)
-    g_module_close (module);
-
-  return result;
-}

diff --git a/gtk/gtkmodulesprivate.h b/gtk/gtkmodulesprivate.h
index 67da320f80c2973a772cfced6f772114f97c1749..b7d5793127ba327be3b026e4be35df2d872b37d0 100644 (file)
--- a/gtk/gtkmodulesprivate.h
+++ b/gtk/gtkmodulesprivate.h
@@ -33,8 +33,6 @@ gchar  * _gtk_find_module              (const gchar  *name,
                                         const gchar  *type);
 gchar ** _gtk_get_module_path          (const gchar  *type);
 
-gboolean _gtk_module_has_mixed_deps    (GModule       *module);
-
 G_END_DECLS
 
 #endif /* __GTK_MODULES_PRIVATE_H__ */